From 473433c93d5e2c57e265ead893b96570569b5b17 Mon Sep 17 00:00:00 2001 From: Hashem Nasarat Date: Mon, 11 Jan 2016 01:02:41 -0500 Subject: [PATCH] Adwaita: fix separator margin in popovers Commit 0b96b8a1 set margins via css, but accidentally changed the semantics of margins for separators in popovers so that any separator in a gtkpopover had a margin. This meant that the separators in GtkListBoxes in popovers also had a margin around their separators, and this is not what we want because it doesn't match separators in listboxes not in popovers. https://bugzilla.gnome.org/show_bug.cgi?id=760427 --- gtk/theme/Adwaita/_common.scss | 2 +- gtk/theme/Adwaita/gtk-contained-dark.css | 4 ++-- gtk/theme/Adwaita/gtk-contained.css | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/gtk/theme/Adwaita/_common.scss b/gtk/theme/Adwaita/_common.scss index da5a1517fc..d6732856ea 100644 --- a/gtk/theme/Adwaita/_common.scss +++ b/gtk/theme/Adwaita/_common.scss @@ -1773,7 +1773,7 @@ popover.background { &.osd { @extend %osd; } } - separator { margin: 3px; } + list separator { margin: 0px; } } /************* diff --git a/gtk/theme/Adwaita/gtk-contained-dark.css b/gtk/theme/Adwaita/gtk-contained-dark.css index 25c31d7b1f..7fe0b7ac85 100644 --- a/gtk/theme/Adwaita/gtk-contained-dark.css +++ b/gtk/theme/Adwaita/gtk-contained-dark.css @@ -2205,8 +2205,8 @@ popover.background { transition: none; } popover.background.touch-selection, popover.background.magnifier, .csd popover.background.touch-selection, .csd popover.background.magnifier { border: 1px solid rgba(255, 255, 255, 0.1); } - popover.background separator { - margin: 3px; } + popover.background list separator { + margin: 0px; } /************* * Notebooks * diff --git a/gtk/theme/Adwaita/gtk-contained.css b/gtk/theme/Adwaita/gtk-contained.css index 392e3489c5..f1f6e627fb 100644 --- a/gtk/theme/Adwaita/gtk-contained.css +++ b/gtk/theme/Adwaita/gtk-contained.css @@ -2215,8 +2215,8 @@ popover.background { transition: none; } popover.background.touch-selection, popover.background.magnifier, .csd popover.background.touch-selection, .csd popover.background.magnifier { border: 1px solid rgba(255, 255, 255, 0.1); } - popover.background separator { - margin: 3px; } + popover.background list separator { + margin: 0px; } /************* * Notebooks * -- 2.30.2